From 51b85cf4a65e6022b2ee9bf6d5a16a0808abad80 Mon Sep 17 00:00:00 2001 From: Ian Campbell Date: Thu, 17 Feb 2011 19:40:17 +0000 Subject: [PATCH] libxl: do slow resume after failed migration attempt both of the current callers for libxl_domain_resume are calling after a migration has failed, one is failure to suspend on the sender and the other is failure to start on the destination, both leading to a resume attempt on the sender. However in the first case, failure to suspend, there is no guarantee that the guest has made it as far as the suspend hypercall and therefore the fast resume method, which frobs the hypercall return to indicate a cancelled suspend, cannot safely be used since it will corrupt %eax/%rax. For the second case, failure to start on destination, I don't think it really matters if the resume is fast or slow. Therefore always use the slow/uncooperative version of xc_domain_resume from libxl_domain_resume. This makes a PV domain which failed to suspend (e.g. because the core Linux PM infrastructure within the guest didn't allow it) recover gracefully. Signed-off-by: Ian Campbell Committed-by: Ian Jackson --- tools/libxl/libxl.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/libxl/libxl.c b/tools/libxl/libxl.c index 990aa8aa24..5dd936fdc2 100644 --- a/tools/libxl/libxl.c +++ b/tools/libxl/libxl.c @@ -226,7 +226,7 @@ int libxl_domain_resume(libxl_ctx *ctx, uint32_t domid) rc = ERROR_NI; goto out; } - if (xc_domain_resume(ctx->xch, domid, 1)) { + if (xc_domain_resume(ctx->xch, domid, 0)) { LIBXL__LOG_ERRNO(ctx, LIBXL__LOG_ERROR, "xc_domain_resume failed for domain %u", domid); -- 2.30.2